Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 16 Apr 2010 03:24:45 +0000 (03:24 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 16 Apr 2010 03:24:45 +0000 (03:24 +0000)

Trivial merge